Mass merge from gingerbread - do not merge

Change-Id: I7f2fa4766e8947c06556d8a87072f7b015e87398