Merge changes Id77b87bb,I56a15c80 am: 9763f21565

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

Change-Id: I2a538361453c7f5039b810d63b9e68b1323cd454