Merge "DO NOT MERGE Froyo CTS Version Increment to 2.2_r3" into froyo