Merge "Secure setting for LocationFudger's accuracy" into jb-mr1-dev