[automerger skipped] Import translations. DO NOT MERGE am: ac3faed024  -s ours
am: dbdd038993  -s ours

Change-Id: I9259ffb054cb66094cc61abc4bccadad31ebb3fe