Merge "AIDEGen: Skip indexing dummy class"