Sync with latest CM sources.