Merge changes Ib5012456,Idbfb49c2,Ieb953c18 am: 4e0a7f22fa

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

Change-Id: I742e07e4edd1f530d2d4d3c1aafd875b55b32def