Merge "Simplify module visibility post build refactor" into mainline-prod
tree: a3700e0338f608c635e8bc1c18612c632ebba143
  1. Tethering/