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

Change-Id: I71b94f86c1e867faa0a351c1001abf57759d3118