am 10b432c3: am be4f1471: Merge "Fix incremental builds" into jb-dev

* commit '10b432c35cf9b9c2abd0d5f484758bbedff5594f':
  Fix incremental builds