Merge "Allow 2.3.2" into gingerbread