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

Change-Id: I5ee0e42879aaf09a93813de1d5cdb9e8c52734f2