Merge "CTS Verifier Version 3.0_r1" into honeycomb