Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66  -s ours
am: 9cf9d294ef  -s ours

Change-Id: I559573199120374e303bfaae5d5c18660dbb369e