[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 3db1e788a2 -s ours
am: d66a7c29f4 -s ours
am skip reason: subject contains skip directive

Change-Id: I144c3ee575c566090c9bc10f1bd7c24f1781591c