Merge from open-source gingerbread

Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52