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

Change-Id: I24bb1932a3933c139e8e472f668deba617c9d865