Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 79bfe12e6b  -s ours
am: 1db479ee26  -s ours

Change-Id: Icba327537143ff1f0753a31123e3f3feb2f862da