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

Change-Id: If94bd033dd33d60268a6ffc437edaad4d70981e1