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

Change-Id: Ibe9da8e0b11a98d3307eee2c7105e37c851e168b