Merge changes I40fe9b79,I4b6f8331 am: 7ef8bca1f9

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

Change-Id: Ic532b745de48852259aa8dda4ee0829bd1c2ecbf