[automerger skipped] Import translations. DO NOT MERGE
am: 847cc98a4d -s ours
am skip reason: subject contains skip directive

Change-Id: Ic9cd5f263a1de20d17fa8e177aaa649442ff6667