Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: Ie7a3c6ea5ac54ce6b1b019c95a62030b322921be