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

Change-Id: I4cb68d51b0dd9dffff66cd851a0d2f48eb1b304d