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

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

Change-Id: Id8ff6d7c699629db338ab0b38e6fa05bda11c028