Merge "DO NOT MERGE: Only test up to 140 long file names." into marshmallow-cts-dev am: 5ba8e565a9  -s ours am: 7fd65d2259 am: ca7ff7dc36 am: 578b39a209
am: 490293d2e4  -s ours

Change-Id: I04e7a61b5817b8d2f8d3df49e72e450a5a762bbf