Merge changes Icbcba3c3,I96d164e3 am: c662cbf091

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

Change-Id: I01c76d02e5a4028e20a5b3f047b5f897195cda30