[automerger skipped] Import translations. DO NOT MERGE am: 6e879a95b2 -s ours

am skip reason: subject contains skip directive

Change-Id: I2341503b332505c8ef48ac67d114155d3a40bb34