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

* commit 'f8a504fceef3ff55b9ddda0d09e2bc06cd5e1f7b':
  Delete dead code