am 45011f2d: Merge change I4e9fe62b into eclair

Merge commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80' into eclair-plus-aosp

* commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80':
  do not merge -- original checkin to mr2 here: