Merge changes If4c37940,I009c8bef am: f071884b31 am: 2e3eec2b76

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

Change-Id: I8f8877b7b38e24e374bd526a9bb2fd729b1ee4e7