Merge changes from topic 'b30297337' into nyc-mr1-dev

* changes:
  angler: move location/ to vendor
  angler: move gps.conf to top level