[automerger skipped] Import translations. DO NOT MERGE am: a5f77b6860  -s ours
am: 7d1a7ea2ef  -s ours

Change-Id: I20a700bb62a9792923ead613b86ee7e5461d55d5