am 9f642d1f: Merge "More CTS tests for HCE." into klp-dev

* commit '9f642d1fe254cfbb1b609ff4cb516af44f211259':
  More CTS tests for HCE.