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

Change-Id: I896a62c6c88343eeba13406ce3ce71e576899762