[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0fa3646a34  -s ours skipped: d6eb3dbf4b am: 7b9a09d8d2  -s ours am: bf2ee3c9dd  -s ours
am: 22c5a224c7  -s ours

Change-Id: I55e03b6e57defd4f9ae37fb732e929612e26fce5