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

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

Change-Id: If8b3bf41388234facd656a37f0607bb27b2339a7