Reconcile with gingerbread-release honeycomb-LTE-release

Change-Id: Ide009ee977f3b2a5344dcb4843a9274380658560