Merge changes Ice594cce,I9a87f988 am: d7f31801c0 am: 4902c90f75 am: 26adfebc38

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

Change-Id: I2fa64400f806ae5bd082f8f95b0aae461181bbad