Merge from open-source gingerbread

Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c