[automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343 am: 204f727404  -s ours
am: 519fa54629  -s ours

Change-Id: I993fdf5434f660d1b91925fd85241b2b49e4fc39