Merge "Fix incorrect @hide usage"