Merge "Clean up the Builder test." into jb-mr1.1-dev