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

* commit 'c9936c72c128a4a9288424fb082d7e7fe4b9b91f':
  Remove dead code