Merge changes Ifd465fdb,I9b20e21a am: bfb5220ae5 am: 9e5842fe03

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

Change-Id: I1a59561018727c89058daf4e04a7f97beb6e6af9