Merge "Update CTS tests for forceSetSchema."