[automerger skipped] Import translations. DO NOT MERGE
am: 693df84856  -s ours

Change-Id: Ie3ce73954ccdfc35c3971472a541e6ec41d3f6c2