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

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