am 54525d8e: Merge "Clean up the Builder test." into jb-mr1.1-dev

* commit '54525d8e4b2bcffcf33b5df8292e9ec45b9aaa3d':
  Clean up the Builder test.