Merge "Add secure setting for package verification" into jb-mr1-dev