Merge changes I22e6d914,Iabe7ecd9,I79bdb89e,I6a3cedc7 am: e261623906

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

Change-Id: Ic52714c3756902e91e894c0d063591955a422344