[automerger skipped] Import translations. DO NOT MERGE skipped: f874b0912a skipped: 6edf394788 am: e51c2ecbf3  -s ours
am: 0cffedbb1c  -s ours

Change-Id: I88e411daf54a86f7296f6c062cb72cb4862bd0cc