Merge "Fix missing class detector to work for incremental manifest edits"