Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b484143b40  -s ours
am: 307f6a4d92  -s ours

Change-Id: Ibfc25bcb992c45a43c799412a7f47f6a12a77234