Merge changes I7e1a0c81,Ia3ccefa9 am: fe3673ebc6

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

Change-Id: I987742a76b2765613166192c13c63d0ee11c1091