Merge changes I1eff90de,Id0d8c624 am: 9f471ba03a am: 76a96b4079

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

Change-Id: I313b6c5737a6dab5296619abff51ec4a66003538