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

Change-Id: Ie402c8356e404b6354cce97c10fee74ebd181ee5