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

Change-Id: I2786876548e79632ff8aae52cd058ba4eaa57895