Merge from Chromium at DEPS revision 40.0.2214.69

This commit was generated by merge_to_master.py.

Change-Id: I9ba41c6f6a03a532e049bcb822b16fee98be0613