[automerger skipped] Import translations. DO NOT MERGE
am: 222ccb816c  -s ours

Change-Id: If5121db119e5e8590c4252a86b282a099287a01a