merge from gingerbread

Change-Id: I99e03b97ed48d1cc6cbd4176a55b1e06fc5ca5c1