Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941  -s ours
am: 51fc07ad61  -s ours

Change-Id: I336996e228fd3c69f192d3614207f24cec0b4ed8