[automerger skipped] Import translations. DO NOT MERGE am: 07808d1477 -s ours am: fa6604e649 -s ours

am skip reason: subject contains skip directive

Change-Id: Ibe0df37295cebe3686bcdab650b0a03aa8961a09