Merge "Change test versions to (2^31)-1"
am: 288e96e253

Change-Id: I7070c8cf3205379c13d1b15ab4be9820f85a2f53