[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41ee2787b4  -s ours skipped: 705235ca51

Change-Id: I57003c4084de0c55b990bdba5e498fb07c0ad937