Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11922002

Change-Id: I753539b51ea295128d5fde0f13989bdcb0899812