track CMs calculator
Merge branch 'jb-greg' of https://github.com/greg17477/platform_manifest into jb-greg