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

Change-Id: Ib2fcf638c1433c444796d90fa8578c035c60b3df