Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 07e95ca75e  -s ours
am: 0c7484fe08  -s ours

Change-Id: If321122f0b5e23ea29d8a309dee45c320a671468