Merge "Decrement number of updates in LocationRequest" into jb-mr1-dev