Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 8f278a7e06  -s ours
am: f331a01a15  -s ours

Change-Id: I39e1c813b42a2f15c77f88a955a0c692363cbf37