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

Change-Id: I7fac76d938aaa591a908b7a5b7cc5b5d31b79efe