Merge changes I14ed0839,I59f9fde5 am: 4db1b12b3c am: 24d0e12b3e

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

Change-Id: I683998901098e58371f89ab5a71df89e57af67dc