Merge eab0e97b from gingerbread

Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61