Merge "Post-Quick cleanup: Remove CompilationUnit."
am: 2e38434

* commit '2e384346d93a747e19fb74f32eba2d1e9403721f':
  Post-Quick cleanup: Remove CompilationUnit.