Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 37f29b0359  -s ours
am: 4f8b486f69  -s ours

Change-Id: I915c191c0d807b6347df276661ad850d9ef7bd17