[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a40932ee2 -s ours
am: 1735eebfc9 -s ours
am skip reason: subject contains skip directive

Change-Id: I55e11d97aa07d4605cd3fb0539b3e7d59f0cd04b