[automerger skipped] Merge "Add test for OffloadHardwareInterface" into...
[automerger skipped] Merge "Add test for OffloadHardwareInterface" into rvc-dev am: 5d846418 -s ours am: 3f816e54 -s ours
am skip reason: Change-Id Ia402a6caaa0dfaa05d25a02101c515bbd884d33f with SHA-1 56f007b3 is in history
Change-Id: I3e84b5d641917df85a4bc2e4e93ee543082d39ae