Merge changes I3a2191b0,Ide1056b5 am: af13a8b744

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

Change-Id: I5be6adf25166b6597de3b792f4da7212acd3d009