Merge from Chromium at DEPS revision 30.0.1599.16
Torne (Richard Coles) authored
This commit was generated by merge_to_master.py.

Change-Id: I57af2ea8229c40b5a2f5b282f2a800c63c0c99e8
f3ce491c