Merge "Test tethering log dump" am: 7809a5dfa6 am: 61a0857388

Change-Id: I20e8808afefaf0d5964871db976e288191a75ad7