Merge changes Id77b87bb,I56a15c80 am: 9763f21565 am: 0b1ef96898

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

Change-Id: I09c9f01c24eb0944e2410136d9f3834fd65f5598