Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 05f3a5485f  -s ours
am: 1270c28a91  -s ours

Change-Id: I746fea1c9b48b6ef7f102ab91022b65f8891c355