Merge internal changes from Google.