am da630f38: am 8163104b: Merge "Remove dead code."

* commit 'da630f38d28f24e30eeaf7796ecd8d64e0784428':
  Remove dead code.