Reconcile with gingerbread-release honeycomb-release

Change-Id: I8e71c24c079299c073c2b274e9f6aaf1ad960164