Merge "CTS Version 2.3 R6" into gingerbread