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

Change-Id: I40c481e825b3e8e3282007a55462fa9c90c57d87