Merge "DO NOT MERGE Security fix" into gingerbread