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

Change-Id: I36563350a665cb9d8bfa416a1a4b8f63ddcbc44e