[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: d85b5fa196  -s ours

Change-Id: I380547e0e8f628f6663eb65109d41a34d9fccda1