Merge changes Ibffdd9c9,Ief5a16d1 am: cedb057e2b

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

Change-Id: I58dbf347fcad7229c19ed192f137dc97f180db42