Merge "Increment CTS Version to 2.2_r5" into froyo