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

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

Change-Id: I9296e3176af728928d5158dbe50181c3632d4fc3