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

Change-Id: I1b4a0545fe3e873bf3276e036f1f7edc067a25eb