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

* commit '70f17822987607e74dd891fe537a20e13d379df1':
  Clean up the Builder test.