[automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours am: 272f241fd4 -s ours
am: 2c4800b4f4 -s ours
am skip reason: subject contains skip directive

Change-Id: Idcc1af57aafcb361f267ab0defd607b6a70361f0