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

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

Change-Id: I3eb6f5ee04f3b30ff8ed4398bbfc45d0f546f758