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

am skip reason: subject contains skip directive

Change-Id: I122a6945a62a961c84b56109a671252b62e272ce