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

Change-Id: I3cb7b968362ebc7d629a617165683dcc17add228
tree: ed028988fc328302897f66e6593d900b2733a576
  1. Tethering/