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

Change-Id: I418d14c7d7be86a26a54cdec8a17b4cf1696c856