Merge changes I49495684,I0db2e0f4,I07bb811b am: 67665a4571 am: f6016177f2 am: 44cb302f6e

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

Change-Id: I86e5adb3b7eca79e6cf8b7e4e0656cda44368b43