Merge "Fix inconsistant results for some cts tests."