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

Change-Id: I96d9c99869652d2d1aad512772394ef433296b6d