Merge "Backport CTS hostside test features am: 715e3cd95c am: ded52c8852  -s ours am: 3dee435136 am: 3903b171ba am: c1b11e26e2 am: a3297a17d7" am: 6789586a1a am: 9a79fd2b75
am: add305f8a4

Change-Id: Ic7b659a21cf8449ee8ffe099fdcf34b10b10edec