Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef

Change-Id: If65885435886fab23f7948900127df09f08c15f4