Merge changes I1dc28606,I4d77c435 am: dd58ffd1a6 am: c294f82184 am: 6f26810e2a

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

Change-Id: I5ad65a0c236e9c5ff82d2d84feb8aa31e5e3d1a3