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

* commit 'f4bfc66d0009f131a60d30508a0a786b3db083af':
  remove dead code.