Merge proposals dependent on lp://qastaging/~chromium-team/chromium-browser/quantal-proposed

1. quantal-proposed
2. Dependent merge proposals