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

* commit '07cca31300667061ce2b011aff789ffdb8924a1e':
  Clean up the Builder test.