Merge "Add change markers to StringIndexOutOfBoundsException."