Merge from Chromium at DEPS revision 267519 This commit was generated by merge_to_master.py. Change-Id: I014369dab8d09104503b0391121b468da3742dbf