[automerger skipped] Import translations. DO NOT MERGE
am: 05cf17a925  -s ours

Change-Id: I2c59a155b3d113099069840a08da8d90f8d1543c