Merge "Address the comment of aosp/1288493" am: 974d6f5978 am: b51ef98b86 am: 250a10eec4

Change-Id: Iea3ae73bdafc8ca3be77be23e70ba86ab623a128
tree: 5d0612dc8107e36daf9db63cf8e6d38227103359
  1. Tethering/