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

Change-Id: Id14b2e9356f7a63d6cb703af6431eafc1eff61c0