Merge from open-source gingerbread

Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab