Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7cc053233b -s ours am: fc0a43743e -s ours
am: 8d0a15c4f5 -s ours
Change-Id: I69b7c005b4dc5b4c63743a7a315bf2aa3e4e290a
This commit is contained in: