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

Change-Id: I5e27882dde15352c8121ed35eb72114f33ff8d53