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

Change-Id: Idffad296cc0815057e4fc1ab60955e0befd1fe12