Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c051914a46  -s ours
am: 0575a4d1c5  -s ours

Change-Id: I3d56504eea30f87b62bf40a98a9ddb546c7cafb0