Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release

Change-Id: I320527540fdce2e199519850517b765fee6724e5