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

Change-Id: Iadc65fe5f3750897f0ad0fb5bcd4085ef8847b8d