am 87b94b13: Merge change I6e01fa52 into eclair

Merge commit '87b94b13ea8ad708d079ddfafe4801c12c38e57a' into eclair-plus-aosp

* commit '87b94b13ea8ad708d079ddfafe4801c12c38e57a':
  Remove unneeded icon.