Merge changes Iadcd5d8f,Ife2a5a9f into rvc-dev am: 19824afef3 am: f14d133b92 am: b904ba0314

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

Change-Id: I5b5dff95dd136889da96b858cf12e99bbf9d1d47