Update skip test handling.
am: 7cfd24e97e

Change-Id: Ib1e5b7e8d2066a8b66a7dd38c6c6ca79f433b29a