Merge changes If936afa1,I3df8a1e8 am: eea13742e8

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

Change-Id: I35b80c40281094718e2105db7b645e8967bf6862