Merge "Remove 1000 element arrays from tests." into nougat-mr1-cts-dev