Merge "Fix style issue in stub_test."