Reconcile with gingerbread-release honeycomb-release

Change-Id: I70f4170b78ed5412a4addd3c603c8ff52c8cfa0d