Reconcile with gingerbread-release honeycomb-mr2-release honeycomb-LTE-release

Change-Id: I8ea53082a2a9d54a8004ff834d2344b989ca0fbf