Original CL: https://codereview.chromium.org/2711543002

Revert CL: https://codereview.chromium.org/2948943003

This Cl is to revert the revert, since the issue has been identified and not related. Detailed in crbug.com/735574

BUG=734265
[email protected], [email protected], [email protected], [email protected]

Review-Url: https://codereview.chromium.org/2711543002
Cr-Commit-Position: refs/heads/master@{#481059}
Committed: https://chromium.googlesource.com/chromium/src/+/b0045cb0dec61387b7cc05049c2878b406bc298b

patch from issue 2711543002 at patchset 700001 (http://crrev.com/2711543002#ps700001)

Review-Url: https://codereview.chromium.org/2951293003
Cr-Commit-Position: refs/heads/master@{#481740}
24 files changed