Merge changes I91ea3a20,I165d28c4,Ieeb7eee0 am: ba4c0f9997

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

Change-Id: I7a9e436361140ec62662a25bd23fdd171aa71fc3