Merge "Add @hide tag to fix SDK build"