Original change: https://android-review.googlesource.com/c/platform/build/+/1652239 Change-Id: Ia4d336d6137c710efe027357103e16aba914bc7b
Original change: https://android-review.googlesource.com/c/platform/build/+/1652239 Change-Id: Ia4d336d6137c710efe027357103e16aba914bc7b