Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 47e6925d54  -s ours am: 933403af15  -s ours
am: 856f89fb00  -s ours

Change-Id: Iaf1c09873f75ad05ae93f31ef139b1b0791e50ca