Merge changes I51628abe,I412d62b7 into rvc-dev am: 82e0c384f3 am: 9d3c9c5bfb

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12100252

Change-Id: I2fa13d496607793c58b88f46e02495ac8cc8d574