[automerger skipped] Import translations. DO NOT MERGE am: 9b06717b11 -s ours

am skip reason: subject contains skip directive

Change-Id: Ie18db4fee97b2913399da94ef43014753773a750