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

Change-Id: I6bf75581266953ee24347d9248a6f672a0db7651