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

Change-Id: I52173a50fff40020cb759cb208ec228114dc7f52