Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I479df7e49aa3a7162673e2b0f11c3fbed1384ba4