Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0