Merge "rc_old/new_len null for CategoryMembership RC change"