Merge proposals dependent on lp://staging/~webapps/unity-chromium-extension/chromium-browser-quantal

1. chromium-browser-quantal
2. Dependent merge proposals