Merge "ir impl point fixes" am: d63448070c

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

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