Merge "Fix remaining api-ref references"