[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: df1b6a4811 -s ours am: 307c95a3e7 -s ours

am skip reason: subject contains skip directive

Change-Id: Iae7e56fb8bb43c17e1791a799afdddc9e20d6d97