Merge ee4c17ee from gingerbread

Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690