Merge changes Iadcd5d8f,Ife2a5a9f into rvc-dev am: 19824afe am: d2cf83eb am: bf3dd9cb am: eb37f27a

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

Change-Id: Ibe34b96fedb61b1e8c1acf1370efa300fb5b6125