Merge changes I66c97386,Id205c88d am: 05a7dfa104 am: 25d87e4419

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

Change-Id: I3b48cc428b332122b8e445eef9b9e1e23152e9e2