Merge changes Id0fe51d0,Ie3b3907b am: e0461422e1

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

Change-Id: I6315a7ab8655869ac851932a072feeeb954ff607