Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f  -s ours
am: 0a1948e515  -s ours

Change-Id: If6c330da79edb94911ec1fb076a29e8c485ca725