Merge ba3dd323 from gingerbread

Change-Id: I615bf5177abbc680292e0116491da58835c7396f