Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a ...

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a  -s ours am: 9cf9d294  -s ours am: e2f2fbae  -s ours am: 6df13861  -s ours" into oc-mr1-dev
am: 0f3e1194  -s ours

Change-Id: Id1501a1b8cb79140c608810f6580a8c7cb3660f4