Merge change 6852

* changes:
  Initial cut of legacy public API unit test.