Merge changes I390aa702,I9084343c am: 0c77e4d25a

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

Change-Id: I1496525e836e6b669e6074effe862457fd85420e