[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 15f0fe0f05 -s ours
am skip reason: subject contains skip directive

Change-Id: Id780ef1e67c472d788b5bf9b840fa54df9d2f69f