Merge "Handle NLS metadata when provided as strings" into sc-dev