Merge "fix broken build due to dummy source file no longer being needed."