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

Change-Id: I43d3d8e14417f7aed30a470191386753c9957701