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

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

Change-Id: I414ec8c12b221aa606135b38afbf73df12457699