Merge "Fix bug where location provider fails on secondary users. Bug: 12592045"