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

Change-Id: Ibdf03fc0e8582ef252ee5c922b206685de2b9829