[automerger skipped] Import translations. DO NOT MERGE am: 889e4712dd  -s ours
am: 02415293d5  -s ours

Change-Id: If9c4fd4b273fabf894f54878da545213832d71ce