am 30b5bea0: (-s ours) am 6fdd4963: Merge "DO NOT MERGE Remove dead code" into jb-dev

* commit '30b5bea07b7357b5063a12e54f002adae9af2b39':
  DO NOT MERGE Remove dead code