[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0bc8e73ec9 -s ours am: b1547258b7 -s ours
am: af21a476ea -s ours
am skip reason: subject contains skip directive

Change-Id: I6cb7f0e8b0186eff5b18fa134493f1673b8e8a3b