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

Change-Id: I01e54375e0cc37def80a199a8ce2fbeb8fb37865