Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c016ef25c8  -s ours
am: 318728fd6b  -s ours

Change-Id: I230701f9b32e0b51962459ac740ddcb446415b96