Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0a2dbc7a8f  -s ours
am: 8c539aa606  -s ours

Change-Id: I7bf03812f395928d6e936dc25ac1a639d094ae8c