Merge changes Ia3aa8b3b,I6e8b80a8,I28552889 am: 2e67e77752 am: 5be39f6b81

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

Change-Id: I0519a75aad7f697c27473c9188cec07aa26f9f72