am fd5155e7: am 48ecb3a6: am 58b52fb1: Merge "Remove dead code."

* commit 'fd5155e7eb64563285831c774e112cf7513adb43':
  Remove dead code.