Merge changes I1dc28606,I4d77c435 am: dd58ffd1a6

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

Change-Id: I47142bb516ec474c78d9324ef049a232b31426a4