Merge "Fix another access of string array that may potentially be null."