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

Change-Id: I5cb8b98facfc7961b88ee2c66350ca67b87e4b99