Merge "Merge up to 707d93c from chromium-dev."