Merge "DO NOT MERGE Update CTS Version to 2.2_r2" into froyo