Correctly handle empty source files in Clang-Mapped traces.
Merge upstream development into lab development.