am 331b2a6f: am 6d0d6ef1: am fc618484: Merge from gingerbread

* commit '331b2a6f8345325c5a8b312a428aaea9192a455b':