Merge "DO NOT MERGE Fix for CVE-2011-3045" into gingerbread