Merge changes Ia3aa8b3b,I6e8b80a8,I28552889 am: 2e67e77752

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

Change-Id: I4f8df82e6d7419a43d666132199705056221d5dd