Merge changes I350c8c88,I1e462fad am: 6c31ab7a13

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

Change-Id: I1d306a83f479a32c6b9fa781abf2f7be6a6ec26a