Merge changes I1eff90de,Id0d8c624 am: 9f471ba03a

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

Change-Id: I9d222ffad3072030a79cb65d2af179d98316bc03