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

Change-Id: Ida46c6f5dceaf39a6d6490b2beae373b0b1e3e0f