Merge "Change @IntDef flag param to true" into sc-dev