am fc618484: Merge from gingerbread

* commit 'fc618484abdca2f2378c1aa3dcbe1abe8a9a7f7f':