Merge changes Ibeffa4a3,Ibce3bac9 am: d9a6144435 am: 61714d22dd

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

Change-Id: Ie857e8cfcb43a9f3e8cdf748c4d3c6b35c3047dd