Track these from CM

Since Privacy Guard support was reverted in these repos, we can track them straight from CM now.