Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 970261b46c  -s ours

Change-Id: I1f37c148c9d2086d198443c596880fbc57cbad4b