am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev

* commit 'ad84f7f46b0207a7ad316b4df37c1f02c889cca9':
  disable geofences for secondary users