am 81266d99: am a218e014: reconcile with open-source gingerbread

* commit '81266d9936605ab3fb6347d28cd7f4a81d6e23e0':