Merge "DO NOT MERGE Update CTS Version to 4.0.3_r2" into ics-mr1