Merge "Fix the support lib for the correct clip group support."