Merge f126ad3b from gingerbread

Change-Id: I13a79033239d306fcf9291ca7fad7445f2cd1f47