[automerger skipped] Import translations. DO NOT MERGE
am: 5223e55714  -s ours

Change-Id: Idad46c75f15d0c86502a6da620729217798fbe66