Merge "Fix another build break."