Merge changes Iadcd5d8f,Ife2a5a9f into rvc-dev am: 19824afef3 am: d2cf83eb1e am: e6a1a16c35

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11826888

Change-Id: I2e1ac37a776dc58353af9ca6be87fbf1cd58c782