am bc36b523: am 7b085571: Merge "DO NOT MERGE Adjust update interval when...
am bc36b523: am 7b085571: Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev
* commit 'bc36b523':
DO NOT MERGE Adjust update interval when expiring location requests.