Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 84bf8e0122  -s ours
am: ebe7e23af7  -s ours

Change-Id: I44f53736817abfc13924ee936c074c69f51223b6