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

Change-Id: I60aeba1caa5fc32622472cf22f09c24d909fcf07