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

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

Change-Id: Ic73deb05f9fb1fa2eb933e95c16a0713da279d09