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

Change-Id: I1793cd11f1459dc52738e580979aa25375ff4e6d