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

Change-Id: I85c3b6cd59f13145a0bd7e0b22fb34af07633c8a