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

Change-Id: I2ef7b37dce08a4012ed7ba1704841fb2af846b76