Merge changes Ib2acd913,I5d5d1ad6 into ics_chocolate_rb3.2