Merge "Fix google3 sync error"