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

Change-Id: I4d4df109060fa760fbd6b3b6aeffc83e4baf0e75