Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: Id6a21ed49c7147f05143318bcbf36cf9399192f9