[automerger skipped] Import translations. DO NOT MERGE
am: 30b9cfb2a4  -s ours

Change-Id: I70309ef41ece23d2294bf2be05895f1c8846b451