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

Change-Id: I91c16f50f6b7d51a0278934acdf3953c8c7e7a65