Reconcile with gingerbread-release

Change-Id: I48801e3af5b90f6207f9468d3cabe8c3f7945b82