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

* commit '4ee9b23a6f1856bfe7fa810b585b4ced02745d65':
  Delete dead code