Merge changes I40e7effe,I526d6105,I020f35a2 am: 59f0820b83 am: e3f99e9828

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2031145

Change-Id: Ia51f614a2c93fd7e4f33dd99de8054be958311f9