Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev