Merge "Fix test failure on S image + S module"