Merge from open-source gingerbread - do not merge

Change-Id: Ic48053624dcb200a64776de01ba258800ed3a75c