am 68787b3d: am bbaeaa58: Merge "Configure synci generation explicitly"

* commit '68787b3d1e0b230f3fd812759be03736f73daaf4':
  Configure synci generation explicitly