Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0bf8ae56ff  -s ours
am: 221c05e6d1  -s ours

Change-Id: I15d5908cbf02847651321cea840c10666aa1c245