Merge "ir impl point fixes" am: d63448070c am: 7a84dfc801 am: 7755f76d94

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

Change-Id: Ia9e87b2bf4aefd6225d93fa77b81746cefd580f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>