Use i18n instead of hardcoded brackets and spaces

Change-Id: If914e26f2af23f04c46f011ad8a276a9d3190583
Merge "Use i18n instead of hardcoded brackets and spaces"