Merge "Add more IntDef prefixes for auto-documenting."