Merge "wifi-display: mark certification strings as not tranlatable" into klp-dev