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

Change-Id: I15b6b8b36e781b7e627f9cc05df22bcb723d1c15