Merge "Address comment from aosp/1232197"
tree: 30699111280f24832c09fa05a504a24c17e26a4e
  1. Tethering/