Merge changes Ia2ec1b81,Ibc831ae8 am: 49380ebecf

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

Change-Id: I30c59129aa0eb623657c752f6b25679ef6270603