Merge changes I9ce48ec4,I16844f82 am: b3d800c52c am: 327647cfbe

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

Change-Id: I23eee16a835a04cdb534c35a241546cd6143557e