Android CTS 7.1 Release 2 (3681763)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"