Merge changes I580e3f1d,I8e271982 am: 8ec315a25e

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

Change-Id: Id5138a91c4e81ee86b72447ebc5d0a8249a8a872