Merge changes I32ad8ad2,I86047955 am: 6d454d5f28

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

Change-Id: I743a1000be7c49b16b2b4c7ab494e11791b2699f