Merge "@IntDef incorrectly marked as containing flags" into sc-dev