am 6fdd4963: Merge "DO NOT MERGE Remove dead code" into jb-dev

* commit '6fdd49630834b1c20a781c9d29b241a68d1289ef':
  DO NOT MERGE Remove dead code