am 12c62e11: am 0739ebcb: am f8a504fc: am 1a51a136: am 4ee9b23a: Merge "Delete dead code" into mnc-dev

* commit '12c62e117c17911baa32678e562206d88bb355e5':
  Delete dead code