Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1  -s ours
am: 603a43e5c3  -s ours

Change-Id: I57e366359829001bd92fa0b77d8068cb30c18456