Merge from open-source gingerbread

Change-Id: I7dce3075bab5831b48a66ef43a32a2be82eda19a