Merge changes Iee0932b5,I0d77c490 am: f8cd69af8b am: e8c3bd931b

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

Change-Id: Ib6c4addd2c44d50d9fde371f754b599748ba4588