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

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