am 12efb096: (-s ours) am 5e481383: (-s ours) am 6d254778: Merge "Seperate test list from activity so it can be reused."

* commit '12efb0960a985ecb9e970b1aec799448be9723d6':