Applied diff from eklavyamirani's cl [1] and rebased to latest master revision.
This is the starting point for taking over the cl and continue working on it.

[1] https://codereview.chromium.org/1769373003/

BUG=580391

R=mcasas@chromium.org

Review-Url: https://codereview.chromium.org/2024993004
Cr-Commit-Position: refs/heads/master@{#401952}
11 files changed