Merge "Fix @IntDef annotation javadoc"