Merge changes Ibffdd9c9,Ief5a16d1 am: cedb057e2b am: 3242d15698 am: 10a12e1de6

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

Change-Id: I84736e5771c6c884cd520f98a36a5fee9aa48b57