Merge "Hide integrity @IntDefs"