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

Change-Id: I17a78777cffd4fa0083555c9c073daa26c9df6fa