[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0 am: 236da59677  -s ours am: 94c6fa964f  -s ours am: d8749970e3  -s ours
am: 07a4d16c1f  -s ours

Change-Id: If8257d8cb42b792624eba6794c2379bc7eeb8527