Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev