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

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

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