Merge cm-10.2 manifest