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

Change-Id: I1a8639300f517c0c26c411221532d26f406c99c7