Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94 am: 5ba953cbe9 am: 8c72e188f2  -s ours
am: 499ef2ced8  -s ours

Change-Id: Ic57560801d53403e25d6547214e46862b232a0f0