Merge "Add setting to skip verifying ADB installs" into jb-mr1-dev