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

Change-Id: I3f02cfda4f02125c10f18c921eacb9d2472d3f3c