Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release am: 3b30b92fac

Original change: undetermined

Change-Id: I2b07dba7aa4f4d8c30d61f81afe4dcb0cb0db845