[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41ee2787b4  -s ours skipped: 705235ca51
am: e15cb623db  -s ours

Change-Id: If1d3c8b5d25c1faeac56120ebdf23f83863dd60c