[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5  -s ours skipped: d855899adb am: 350fc5d06a  -s ours
am: 02ee278871  -s ours

Change-Id: Ice440c8517e49f87b42dadfe2a728e65c9a3bcaf