Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7804b17f0e  -s ours am: b7c6238556  -s ours
am: a690e7362d  -s ours

Change-Id: Iffe01cedcfb01c31c9f89e3ddb459552934fb000