Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1741524a82  -s ours
am: 6a6db79a4c  -s ours

Change-Id: I3e9d8e78708a11a28be6c177e0785d6a5b1af97a