Merge "Removing errant @hide annotation"