Merge "Fix IDEA warnings in Xhprof class"