Merge "Cleanup some support test classes"
am: af8b6bd4af

Change-Id: Id30ec1bdaa071f0f4ec8c8ee6a8a6cfe6ef0abc6