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

Change-Id: I6849b0485a6722aacb4b1d76a07c82b3764f5c06