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

Change-Id: I4ac063b6bf16db4e571c2117631d1ffd9e8103f1