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

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

Change-Id: I7f4d3ab2038ea76ceb20d6490a7a775a18f524e0