Merge "Fixed failing WM pre-submit tests"