Revert 140996 > Revert 130950 > BUG=163593
Revert 140996
> Revert 130950
> BUG=163593

TBR=cevans@google.com

git-svn-id: bf5cd6ccde378db821296732a091cfbcf5285fbd@140998 bbb929c8-8fbe-4397-9dbb-9b2b20218538
primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs,primiano/blink-gitcs