Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: Ic8c04a257aaf0ecf5348d176def5bedc6c640ee0