Merge from Chromium at DEPS revision 40.0.2214.38

This commit was generated by merge_to_master.py.

Change-Id: I1c83673bd578c2ec05e004bf69c336ae6df73dd7