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

Change-Id: Ia001a7364a761781ce15e61db6988a1961cb2bff