[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

Change-Id: I8cdc2239faba5031d836b9e29673e8b93da57e77