Merge "Follow-up 77276ce: Clarify i18n message key/values and div class"