am b538ba1e: am ca2cb184: Merge "Suppress location information for non-active...
am b538ba1e: am ca2cb184: Merge "Suppress location information for non-active users." into jb-mr1-dev
* commit 'b538ba1e':
Suppress location information for non-active users.