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

* commit '021aa4cefe03fd7cca5ee4baf25a562c6f6cda20':
  DO NOT MERGE. Fix build by removing old file.