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

Change-Id: Ia04da67d26029ff1e45aa37acb12065636f0b0d3