[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0fa3646a34  -s ours skipped: d6eb3dbf4b

Change-Id: I663a8b386f4809aa08c3f26f6d28014405039490