am ac14efce: (-s ours) Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev

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