Merge "Moving product specific strings to a separate directory"