am 61398da2: am bbf627a6: Merge "Remove unused code."

* commit '61398da24b7abe657fad0a0db2a47cf940f4e58b':
  Remove unused code.