Merge "Fix GpsLocationProvider wake lock book keeping." into jb-mr1-dev