Reconcile with gingerbread-release honeycomb-release honeycomb-mr1-release

Change-Id: I91591a34a635eab5a75caa9841fff830987c85be