Merge "Moved some stable WmTest post-submit test to pre-submit"