Merge "[521999] Handle IBM java.lang.String implementation"