DO NOT MERGE: Only test up to 140 long file names. am: b0a26b19 -s ours am: d2b719d6 am: 34da34b2 am: de83e82c Change-Id: Ie1f45759f68bdf48ebc67f39c4a27c449d3b9a2a