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

Change-Id: I2340e89591f6c4f2f11a67493dcfff9c9ff15d42