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

Change-Id: Iaae57c91c09a4b1780c0c8e474700c56133b264e