Merge commit 'fae8b8b90ed014cfc63f9edb40e27a9d60123075' of sso://googleplex-android/platform/cts into HEAD

Change-Id: Ib6057c23c175defc0031193d11fc1cdb1e7a2048