Merge "Remove dead code" into jb-mr1-dev