Merge "Address API review feedback" into tm-dev
tree: f4174fcf63d0d4ac357720216abc89fbbab545dc
  1. nearby/