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

Change-Id: I55b4283893453ef46897b4bf8aaee7a389c7ae12