Merge "Remove unnecessary @hide from private method"