am 1a51a136: am 4ee9b23a: Merge "Delete dead code" into mnc-dev

* commit '1a51a136fdabe24a26b218fd1f52197093307ce5':
  Delete dead code