[automerger skipped] Import translations. DO NOT MERGE am: 39f3c4a5cb  -s ours
am: f9ff9080a8  -s ours

Change-Id: I67a169032c0607b9d5b9877f67779a3a12aa9ee9