Merge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev