am bef31431: No-op - reconcile with open-source gingerbread

* commit 'bef31431cafe100e382a3caf7ea7dce343832d68':