Merge changes I819a2942,Ife0607e7 into pi-dev

* changes:
  Fix OffloadControlHidlTestBase.AdditionalStopsWithInitReturnFalse
  Add debugging to VtsHalTetherOffloadControl test.