[automerger skipped] Merge "Add test for OffloadHardwareInterface" into...
[automerger skipped] Merge "Add test for OffloadHardwareInterface" into rvc-dev am: 5d846418 am: 36f4c776 -s ours
am skip reason: Change-Id Ia402a6caaa0dfaa05d25a02101c515bbd884d33f with SHA-1 2c5c657a is in history
Change-Id: I496bec6390eb7cb4bf5e6d393703a2c801f81d9f