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

Change-Id: Ib0df8eaec53f178059678eb321fc1680df4ea1fe