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

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