Merge changes I9638e90b,Ib2636dfc am: c58d1e4aec

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

Change-Id: I54b5873749ec46f6489d6e6f8224759239b0b25e