Merge "Update CTS Version to 3.1_r3" into honeycomb-mr1