Merge "Fix generated-sources-dir-for for COMMON"