Merge "CTS Tests" into honeycomb-mr1