Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 3c54cdf15e  -s ours
am: 19e2b518ff  -s ours

Change-Id: I4b314ea8424f4a14cbb0a9c173d6ada9c4501953