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

Change-Id: I937e0512b62ae2d4864acc3e7d7d0a74e8eeddfa