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

Change-Id: Iee603d93a2a105600195663aa7101312f9e6bcc7