[automerger skipped] Import translations. DO NOT MERGE
am: 52b23c5d89  -s ours

Change-Id: I459a410021541debd4bdc32ca94a950cdb96aba5