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

Change-Id: I169149041264697fac39c32025d305b01a855a00