Merge "DO NOT MERGE Update CTS Version to 2.3_r10" into gingerbread