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

Change-Id: Ic7f85082337cee707f4166508ae49986471a925f