Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7cc053233b  -s ours
am: fc0a43743e  -s ours

Change-Id: Idd71b32264c2fe1dc2b2cc572778882650170f81