Reconcile with gingerbread-release gingerbread-mr4-release

Change-Id: I7652fcb5face6c9940511e8d3aa0e3fa86432442