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

Change-Id: I39f298c62ae870a0a764a1cb60d766e8e03f692b