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

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