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

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

Change-Id: Iec18493386f896dc1c9032016dc1b2436a0ca7c9