Sync changes for Ubuntu build from master.