Merge "DEFAULT_VERIFY_ENABLE turns verification off" into jb-mr1-dev