Merge "Replace @hide API with public API"