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

Change-Id: Id6708aa60a9d2d91381f89258465c6e967dbdf6d