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

Change-Id: Ibc93567a28a3709b6f97a5cd03cde04a94bac751