Merge "Add support for fully skipping tests"
am: 06a0ae35a3

Change-Id: Id126b8429d9a46640f6ccc871497598d1f8121d3