Update skip test handling. am: 7cfd24e97e
am: 14059b1445

Change-Id: I3103ea3368dc1eda1121209e870ebd9eff1cffe9