Merge "Add @hide to more constants"