Merge changes Ice7f465a,I3eb2bee8 am: 769c2b61d5

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

Change-Id: I975b5cc425cebe691ec73662aee6340864475757