Merge "multiuser support for LocationBlacklist" into jb-mr1-dev