Merge changes I66c97386,Id205c88d am: 05a7dfa104

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

Change-Id: I5182d03b7a44b9034ea096233d07708b5de24ad2