Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931  -s ours
am: 2d00ab621a  -s ours

Change-Id: Ib3d980494cfeb7ddc621e1185429635cc5b3ab8d