Merge changes I72edc4dc,Iead7bd25 am: 8f71c9629d

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

Change-Id: I067365c25a659207fce3bd0361b47f35389775e4