[automerger skipped] Import translations. DO NOT MERGE
am: 005ccd94b9  -s ours

Change-Id: I95a412c90c25d28a83549d480b228c65f259a691