[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 355dfa6850 -s ours
am: 071424bf41 -s ours
am skip reason: subject contains skip directive

Change-Id: I54645bcf37dab935ac61377b5a2d2ca4252412d9