Merge from open-source gingerbread

Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461