Merge "manifest: track CMs bionic" into jb-mr1