Merge "Fix compile errors after merge."