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

Change-Id: I2f2564a295bdaa73cabc41ade774c3ced7d07e6b