Merge changes I743c0522,Id90f4e31 am: 370a397ab4

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

Change-Id: Ia3bdd092b60fa4e9b3a968e99fc8fa4737fdcfdd