Merge changes I9ce48ec4,I16844f82 am: b3d800c52c

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

Change-Id: Id11e99a837c0af612264f27353d4d6338714e190