Merge changes I14ed0839,I59f9fde5 am: 4db1b12b3c

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

Change-Id: Ie4dd55349f1128cdf8a36e6ed5b49c0e14267088