Back to CM

This is last manifest push for now

Change-Id: Ibdd8ba3afc251c09255b8a7d48949a50eee8ec7c