-
robliao authored
This reverts commit f07732ec (https://codereview.chromium.org/2791933004) and reapplies b6d0c9a0 (https://codereview.chromium.org/2690183002/). BUG=653916, 707986 TBR=jam@chromium.org, rkaplow@chromium.org Previously reviewed at https://codereview.chromium.org/2690183002/ Review-Url: https://codereview.chromium.org/2856583002 Cr-Commit-Position: refs/heads/master@{#468376}
3e27cb6e
