Merge commit '7c5690dfef07f4455b47732af0c03cd6ae436c8a' of sso://googleplex-android/platform/prebuilts/sdk into HEAD

Change-Id: Ibb76cf1f4471de2586807d8fb05930fd3640a5cb