Merge "Replace @hide APIs"