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

Change-Id: Ic8c5c22925b1249c6041075cd67967cbbfd3fd21