Android CTS 8.1 Release 17 (5933254)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"