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

Change-Id: Id7c837a6241f71887a7f67dc1dcdb5b4d2c4d10c