Merge from Chromium at DEPS revision 40.0.2214.45

This commit was generated by merge_to_master.py.

Change-Id: Ibc0b9d3009c7ddc09a3d73607cbd6534785fb040