[automerger skipped] Import translations. DO NOT MERGE
am: 8fc40586d7 -s ours
am skip reason: subject contains skip directive

Change-Id: I772300879a538c99b3ad7ed0a7fadc40e34609f3