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

Change-Id: I7ed9d9242eaa1ceed6a939315151c0b708f5cf0b