Merge changes I9638e90b,Ib2636dfc am: c58d1e4aec am: 3f1381fbcd

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

Change-Id: I086c4fbf373a6fbf77187c5e2008fb9a9a241330