This CL has companion changes in the browser and webkit. bug: 3398386 Change-Id: I09eee11e3a22ba3ce0af67e2a068dc7331dc49c2