Fix skip test handling.
am: 1d6022528a

Change-Id: Icd578c76b5f99cc9d4cd75b76df0af7bf9bd42d7