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

* commit 'bc36b52372be154994f19a9e767184b2d6b4783a':
  DO NOT MERGE Adjust update interval when expiring location requests.