Merge "Move @hide to fix javadoc."