[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 28815c5b0e  -s ours skipped: 0534420c5d
am: 6866408a78  -s ours

Change-Id: I33a4d20f2fad121680ee0e7d6f68135f41d23ae1