Merge changes I875067c9,I0bb0fdc9 am: c594ada00b

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

Change-Id: Iae65c0aefbe60b96c7a229d27e6dcd80c694f7a6