Merge changes I21563564,I2afd6444 am: f3b02fc2db

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

Change-Id: Ic9e68ba8b3ae82eb7f17a7367b8152e919bcec78