Merge "CAS: Add missing @hide annotations"