am 531b835b: am 460fefc3: Refactor setup and common code into a superclass.

* commit '531b835b28def455f4955a3f7660c2f48f6fdefd':
  Refactor setup and common code into a superclass.