Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: Ied4b07c459a4013851cbee43ebc25efe787ced4d