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

* commit '64e831889f83abf4ab9c2e071ab9ab0db57d1c41':
  Fix CompilationUnit constructor issues.