Clean up some leftover performance files and strings
Merge "Clean up some leftover performance files and strings" into jb-mr1
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1