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

Change-Id: Ia9e4bd8eeec153bd3ba21c06320b743e60127921