Merge "FusedLocation runs per user as user" into jb-mr1-dev