Android CTS 5.1 Release 18 (3824209)
Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: If25117d42e5d25a7d668afba62840d41caa60320