Merge "Add milestone manifests" into jb-mr1