Merge "Explicitly Document INT_MAX for Invalid Fields" am: 304c0ce012 am: 93378a6017
am: bfc9855ae4

Change-Id: I2e9cfbbd94d8560957701fb0ca7980a1b7b80ec2