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

Change-Id: I9d23c6267a38545927029782293ef8a15961cca7