Merge changes If73b3e9f,If67bf4ff am: b87fef9c32 am: f92be0673d am: de5e723318 am: 8572aae3f6

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1723072

Change-Id: Ibc471a29ff574329c88ca840ef0ac35a39d61f6b