Fix skip test handling. am: 1d6022528a am: af21c9ef19
am: 16ea356023

Change-Id: I4808260fc9b8a7c21418f0ff2e164bfc6e321cad