Merge from gingerbread

Change-Id: Ic33eb4a67fdf638f2ba192d60b6a8cf6f9c72be7