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

Change-Id: I5a63aa71a1f2d5b92c18c2c009c8732594986e1b