am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev

* commit '83f60c5247ba60b6aa536b2d8191df9289102600':
  FusedLocation runs per user as user