Merge "Define deprecated fields in IntDef's" into nyc-mr1-dev