Merge 1304263003 to m45

BUG=521943
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true

Review URL: https://codereview.chromium.org/1304403003
5 files changed