Merge changes I310feb08,I2b6d6b08 am: 242ed1bb20

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

Change-Id: I7a2739b22d9e25cb4352832c6bcb47eab5bcf7a9