Merge changes I2b3f5b33,I464b683b,I8e97c543 am: 49a428b62e

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

Change-Id: Idd80c608cb27f1d31120f5e30e9e41a6a153031f