Merge changes Ie2749dcc,Id1c97b9c,I68d1757d,I8e4b6a80 am: 949f453f7d am: 2702ea29e0

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

Change-Id: I1823d843894805b34723bd13b3cc3d1ed8491b6f