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

Change-Id: Icc3dd8b424542fd5cef9de4768b9c344e7e6381f