Merge changes from topic "thirtytwo" am: ab05f6310d am: 327be8c123

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

Change-Id: I030e7bca3384577dc4b8faa0cd26477c3835cc15