[automerger skipped] Import translations. DO NOT MERGE am: 3fc7472bcf  -s ours
am: 6e78ee9f84  -s ours

Change-Id: I908e1bfe8568128f71a710d62c340effda6482f6