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

Change-Id: I6592f9416213bdf7c4190297b2edf08a5de9ce45