Replace 'return' with a proper SkipTest wrt mwpfh

Change-Id: Ib73fe09c1510e80b43b4da2179579bf6581aad86
Merge "Replace 'return' with a proper SkipTest wrt mwpfh"