Merge "Add message template support for checkStringNotEmpty"