Merge changes If73b3e9f,If67bf4ff am: b87fef9c32 am: f92be0673d

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

Change-Id: Id08bacc8b07247377826acae859d431631a4b2cf