Reconcile with gingerbread-release gingerbread-mr4-release

Change-Id: I8e15abd3f33eecd285c108257dd4d89ee6b1423f