[automerger skipped] Import translations. DO NOT MERGE am: 1754bcd410  -s ours
am: 18a8bd1330  -s ours

Change-Id: I5578c306e1c7fbc6c56348c438be9df0c8c533d4