Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: I8f72e52cf152775c6f613f2556eecb25a7b6f68d