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

Change-Id: Ie8c5ea32885dc3c6ee7b688beaf13f179dc95475