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

Change-Id: Icabcb2f90bb9a1ab13ec338f8d57ae27bc540d2b