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

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

Change-Id: I4b23fc37264cb67d75370fc15a35835240be8cb9