Merge changes Ie9da525c,I9911f02c,Iad18af1f,I5f432a3d am: 41c2e6286e

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

Change-Id: Ibb572370e1fe3daeb242916b4a8c28713f5544bb