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

Change-Id: I4dad5dbe295dbe3b43da7493e66bc6e35140d3b8