Merge changes I40e7effe,I526d6105,I020f35a2 am: 59f0820b83

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

Change-Id: Iee16bf39a6047e51c4e2530106acd5fe933842aa