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

Change-Id: I3da699139b9c67b09c8076f3fdef0c7c115ffbcc