Merge changes I2b3f5b33,I464b683b,I8e97c543 am: 49a428b62e am: 936b56838f am: 56c3cf9911

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

Change-Id: I872ee18745adc1b79517972c7636379e9a909e7a