[automerger skipped] Import translations. DO NOT MERGE am: e147539bd7  -s ours
am: 3e8d38b118  -s ours

Change-Id: I60c97a80584fe94a650c526ccba352608f448064