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

Change-Id: If454b0069d943c2ed2af8a2410f83403e9cf6465