am f84b2524: am 6ebedf00: am 82da01d6: Merge from gingerbread

* commit 'f84b25243d7ebeaca8424171f5ca3b192cc76d80':