Merge from gingerbread

Change-Id: I30902cdb19698f88a1ea57cf8c7667ef867d13a8