Merge from Chromium at DEPS revision 40.0.2214.38

This commit was generated by merge_to_master.py.

Change-Id: If3d4d6be21fe0f12c96ed471bc23ccb5941a683b