DO NOT MERGE: Required platform_testing changes for merge of tradefed repos into am: 1a48ad89 am: 0e7911b0 Change-Id: Iadeeadd0abc246cb8918c43944c3a31cfa62fa77