Merge changes Ice594cce,I9a87f988 am: d7f31801c0

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

Change-Id: I2dff7e25574dca6efc46f72b8dfbd416f1447b48