Merge changes I4b58610f,Ib758756a into oc-dev

* changes:
  Turn off the check in the test because the assertion is off in the implementation.
  Fix typos that cause infinite recursion and CTS test failure.