Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e5fe30c1b0  -s ours am: 9abe093864  -s ours
am: 4c152ae488  -s ours

Change-Id: I586e557c9257797642cafb7857ba1a2b60e3edee