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

Change-Id: I16fbf08ea855a5ec9a064253861f814a5acb6b21