am 043c6737: am ed10d655: Merge change Ia98fd30d into eclair

Merge commit '043c6737165ea8071a290ab7e9e01dac17935b9f' into eclair-mr2-plus-aosp

* commit '043c6737165ea8071a290ab7e9e01dac17935b9f':
  Restore missing string that was still referenced from code.