Merge from open-source gingerbread

Change-Id: I417fc97191a14102617c0a87718bb690a1944e8b