[automerger skipped] Import translations. DO NOT MERGE am: dd25c0d729 -s ours am: 2956a978f9 -s ours

am skip reason: subject contains skip directive

Change-Id: I39b52df4eed2a1696ee7db8a11834e2ec370e0a1