[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb  -s ours am: 67f18d810a  -s ours
am: d635022d93  -s ours

Change-Id: I21b5b66696cb1f6c6683e46c82ee71a7d8751c24