Merge "Remove unused Secure settings." into jb-mr1-dev