Merge changes Ibeffa4a3,Ibce3bac9 am: d9a6144435

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

Change-Id: I360484df0d65534d64415083b390f8b7bcc5c1d2