[automerger skipped] Import translations. DO NOT MERGE am: 7833a3e638 -s ours

am skip reason: subject contains skip directive

Change-Id: If512aab6ecc4b02d351a0259d87950e5028aced6