[automerger skipped] Import translations. DO NOT MERGE
am: cdd65daaa1 -s ours
am skip reason: subject contains skip directive

Change-Id: I6f594a3b08adc6905b702fb304d94cd3ae316eaa