[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 16b6bdf5a5  -s ours skipped: 03ed0985ef
am: 0e2501decd  -s ours

Change-Id: I16708e07aa533aaf608e28ebd19e8a0ad9049e04