Merge changes I74c20512,I65f755a5,I71fc59c7 am: 6934c6e767 am: b40908c27b am: 2c1cd8a281

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

Change-Id: I0977ad8f492f3f8bafe09c9f9971fc68dc82259c