Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 5b812c8df6  -s ours
am: 98313f5996  -s ours

Change-Id: If26ea10608d586d3014bd99d2c27720d2316e37a