[automerger skipped] Import translations. DO NOT MERGE am: 578bbbf4df  -s ours
am: 785208ec13  -s ours

Change-Id: I86b7cea052ae758acbf05d39b2d9280f951caaae