Merge changes I75017420,I3612e131 am: e3f4b84468 am: de50c0081b

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

Change-Id: Ib6fc84794c8273affb34886a6d5e9d19f477dd57