Android CTS 7.0 Release 25 (4959113)
Merge "Snap for 4539635 from 65e0e6e2254eab162d9d8d4e05f598cefef10c5b to nougat-cts-release" into nougat-cts-release