Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9f5e95f64e  -s ours
am: 697f149acf  -s ours

Change-Id: Iee1a8646963d52b43be7fc9de34cc88468b23bec