Merge from open-source gingerbread

Change-Id: Ia24060add81186960781229089e8b3eee1390935