Android CTS 7.1 Release 5 (3943087)
Merge "Remove 1000 element arrays from tests." into nougat-mr1-cts-dev