Merge "Resolve API council comments" into tm-dev
tree: 821a228872a290dc628198d7d3cbaf86f94eeec8
  1. nearby/