Merge "Trying to fix flaky tests related to testCharSequence*"