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

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

Change-Id: Ie6dd06eeb5a2f09a1c6c71af1faa9e7e1a3caaaf