Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 90cfa629cf  -s ours
am: ddad1247bd  -s ours

Change-Id: I23d51c85d11c02e485fb3613d66595f603a41c07