Merge "Address API council review comments." into tm-dev
tree: 3948b3ff47e799ae08a3204cbf7f7288c32b2ff4
  1. nearby/