am 2145c46a: am 2562a40e: reconcile with open-source gingerbread

* commit '2145c46aa288c862ac3dce50877d16c0537bcea3':