Merge changes I267b3ae9,Ic14d2257 am: a2f5b0bc51 am: d0fd20654c am: 7a3eedb0dd am: a40a55aa3e

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

Change-Id: Ieead9ea056c954f8f4971249241db54008a42418