merge 83fdc69e from gingerbread - do not merge

Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680