Merge "Use const const strings for arrays and pointers to strings"