Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01  -s ours
am: d21211470c  -s ours

Change-Id: Ife7d7f70c599c556abebf10eee525072a127b34d