Merge from Chromium at DEPS revision 03655fd3f6d7

This commit was generated by merge_to_master.py.

Change-Id: I659bdd3b127bb83ee982b3e6117a93ad4fa68d54