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

Change-Id: I6369ce728c37d066932736566e465f73e7843eb5