am 517303e0: am ac14efce: Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev

* commit '517303e05b9a9246c8aab53574d768eb52c88e7e':
  DO NOT MERGE suggest LocationRequest rather than Criteria