am 777dda87: Merge "Fix CompilationUnit constructor issues."

* commit '777dda87f14575db960ec4fb5cfd9efb857a6588':
  Fix CompilationUnit constructor issues.