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

Change-Id: I4a128f03ba8263a6b251ce13a9f16764d9177572