[automerger skipped] Import translations. DO NOT MERGE
am: 3fc7472bcf  -s ours

Change-Id: I004f85a326da76a65c1d8fa8072ba719c5e42344