Merge "Remove @hide from overridden methods"