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