Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 1997712de1  -s ours

Change-Id: I4cd5b37f5089c4b004922dc070d837743e58266a