Merge changes Ia39a7e90,I48e497ef am: 40679643fd

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

Change-Id: I8540d53b599e18b137e9ca193c076bd8bf58b3eb