am e97cc7d0: am 8a2f3ecc: am 25503f1c: Merge from gingerbread

* commit 'e97cc7d0b266ac0cbb1be7cf41ff8bb61067025e':