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

Change-Id: Ibe71d1a15eba70b96675afcb711eaa46597ab82d