am 6ad873d4: am e730010e: am 7ab7f538: Hide new location APIs and undeprecate old ones

* commit '6ad873d4a642f823addf519ba252f188424431fa':
  Hide new location APIs and undeprecate old ones