Revert "Revert r38549, r38552, and r38557." This reverts commit 2686535940bdbe2664d4c1bd0012988038add009. R=nweiz@google.com Review URL: https://codereview.chromium.org//1152413002