[automerger skipped] Import translations. DO NOT MERGE skipped: cd6db9ecb1 skipped: 60f9184f36
am: 6501a185b9  -s ours

Change-Id: I6503a4604c54ddced725822542d32d6613c83b97