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

Change-Id: Icdd5b7e1f54acae9914fd79949584ce80d5a489c