Merge d350dc04 from gingerbread

Change-Id: Ieb76b9724a3e253f9614d02cc06d3348b8e2c929