Merge "Generated-source compilation plugin fix"