am bbedac04: am 05f45f89: am 4895e726: Merge from gingerbread

* commit 'bbedac04b0acb9300bb0ab90a1d921b0d0e7dd11':