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

Change-Id: I3f14fb3d9653d3686c34305217342d67eb3cd273