am 68b15b68: Porting change I064698b3 from mr2 to eclair.

Merge commit '68b15b68497e373fe63a13f11e18349a738a7989' into eclair-plus-aosp

* commit '68b15b68497e373fe63a13f11e18349a738a7989':
  Porting change I064698b3 from mr2 to eclair.