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

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