am bbaeaa58: Merge "Configure synci generation explicitly"

* commit 'bbaeaa5879c5ab380c024bd20f35e927f4d19c87':
  Configure synci generation explicitly