am ea03b7b5: am 3d820f2a: Merge "remove dead code."

* commit 'ea03b7b51c786d1d3f73a6a61e673d26828d7533':
  remove dead code.