Merge changes I83babad2,Iaeb081bc am: 9c4caa22ff

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

Change-Id: Ia5019f240a27d1a001485d946c7b6f8fd083922d