Merge changes I74c20512,I65f755a5,I71fc59c7 am: 6934c6e767

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

Change-Id: Ice6488972758310806b9879d542043bd78574a32