[automerger skipped] Import translations. DO NOT MERGE am: 56451af749  -s ours
am: 3be132e475  -s ours

Change-Id: Iecb45aff2223158c414ea7f6d2a60ed5b5374784