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

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

Change-Id: I9e8765e99a8060adfca44328ca73bcfe38444a31