Merge "Add @IntDef for backup transport flags" into sc-dev