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

Change-Id: I172c77b965795da63982138e6cde3abff38b3120