Merge "Import translations. DO NOT MERGE" into cw-f-dev am: d4640c213d  -s ours
am: 5de7e1667e  -s ours

Change-Id: I2b8e966a25261ee261c030cac6766636845c758a