Merge changes I13c9660a,I41745e7b,I0e6722b8 am: 673b6d47bc

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

Change-Id: Ib548fe1bb611a9ffb17dda634010b3f553e9af0e