am 4a66ef4a: Merge "CTS Tests" into honeycomb-mr1

* commit '4a66ef4ace3d9518b519cd5a44b0ce6e6d116930':
  CTS Tests