Add support for skipped tests. am: 849d24e8a4
am: 3a8679f490

Change-Id: Ia823fde8ee5701569da1577d27d0b6d5b97c555d