Merge from Chromium at DEPS revision 40.0.2214.38

This commit was generated by merge_to_master.py.

Change-Id: I950ad4d7dfdea0f1cd60c13baa35b263b48f092e