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

Change-Id: I0a46b477cb406d54a404faa37c121fc8f7de0e1d