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

Change-Id: Ief4d72109f3d90b434db85f03246c8bc59946816