am 94cb7adb: am bee7ce20: Merge "Delete dead code." into jb-dev

* commit '94cb7adb899fdfa9b5b6aa8b8dff4ae01631087f':
  Delete dead code.