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

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

Change-Id: I35df452fb1740fc40be5ed55a9d050e5c1d27b3a