Mass merge from gingerbread - do not merge

Change-Id: I5edb9ed3521a7b7531a57543a11608708641b2e8