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

Change-Id: I2d00cfe8ab1f7d3aca0108531e2de070b73ce660