Merge "Fix copy-paste nit"