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