am 9b9c61f6: am 2a7c5425: reconcile with open-source gingerbread

* commit '9b9c61f6154cfb39c280837698da5834714cab90':