[automerger skipped] Import translations. DO NOT MERGE am: 5b4a2da1ea  -s ours
am: 795498bf2f  -s ours

Change-Id: I0256f139d68dd905ca0383d570c01c3357445c1a