Reconcile with gingerbread-release honeycomb-release

Change-Id: Ic955d22bdfe282546ada37299aa4ce413428c2a6