[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
am: dfcee4113b  -s ours

Change-Id: I3442bae7555bbc1e28ce14c20a90616bff426fad