Merge changes I51628abe,I412d62b7 am: 9e84b3166f

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

Change-Id: Ia7b7e643c2326fb49ad0966dd1b69339650b6801