Fix for SkipTest

Closes-Bug: #1364214

Change-Id: If4bc8bad0991f0f0b71debae10575e6c5bb41213