Merge "Better logging infrastructure in OffloadHardwareInterface" am: 36904fbc94
am: 5ba953cbe9

Change-Id: I87dbd0a8840e57c7959a935e17654a3a4e1b3edf