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

Change-Id: Idfa442e3aeeea9866bd38c7b18ae8311c5051368