Merge "Fix regression from location changes: GPS battery tracking." into jb-mr1-dev