Merge "Fix generated-sources-dir-for for COMMON" am: 623799d3e0
am: 9c4bb4c1c0

* commit '9c4bb4c1c079db6c6c87f30ea861d9bec1ee1df8':
  Fix generated-sources-dir-for for COMMON