am a840c3c5: (-s ours) am 0a2ad75d: am 4104d329: Merge "Add helper methods to set/query the location master switch. Consolidates the logic of exactly what the master switch means so that if we change in the future, we don\'t have to find all the different parts of the code that
* commit 'a840c3c5':
