Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c6c0d901bf  -s ours
am: 8c8e6ef26a  -s ours

Change-Id: I664949ebf418b8d9a8d3a5e80b13caa184ab7df8