Merge "Sample templates: Fix @strings/intro_message" into developers-dev