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

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