Merge changes I91ea3a20,I165d28c4,Ieeb7eee0 am: ba4c0f9997 am: 1bc50d3bf6

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

Change-Id: Iceace49e173376331eb1adf953fa0be36463bce7