am b5720b1f: am c9936c72: Merge "Remove dead code" into jb-mr1-dev

* commit 'b5720b1ff9262419cd331e56c75a60b291bc7694':
  Remove dead code