Merge 1adaa571 from gingerbread

Change-Id: Ic4be80eea5331f2b32b507dd6546b86383306f94