Merge changes Id027b742,I486ccad8 am: 44c294e621

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

Change-Id: Iaf5b44fc72dd3ad259d22ed04cf20f215f9136c2