Merge "Merge "Fixed the translation of messages" into rvc-dev am: 68de49c9...
Merge "Merge "Fixed the translation of messages" into rvc-dev am: 68de49c9 am: 89c306ca" into rvc-d1-dev-plus-aosp am: 2779e4ac
Change-Id: Ieab3b13ec1afe25db0b9c963c7fd1b2166953f60