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

Change-Id: Iea7a27543e33d89ea36cdff3104765ae0233d1f6