resolve merge conflicts of a7beb109 to rvc-dev am: 602859b1 am: 89473c28

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

Change-Id: I85b66ca0536a8e5587b645eef1121e4055aa54ce