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

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

Change-Id: Iaea67d1389619f06f39e95d48613901a53cc3d98