[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 15995daccf -s ours
am: 57ac183257 -s ours
am skip reason: subject contains skip directive

Change-Id: I6736fe6855da88c230137879739b39955c237065