Merge from gingerbread

Change-Id: Ibc0d1ab94e796f1b3f4fb67d5c22514ce87fa399