Merge from Chromium at DEPS revision 40.0.2214.10

This commit was generated by merge_to_master.py.

Change-Id: I01ec9fc92af1d8d7aef59c8bef66e29bd71b7a75