[automerger skipped] Import translations. DO NOT MERGE am: 9e39db9d62  -s ours
am: 5285ef3490  -s ours

Change-Id: If76fe3e71cc1705530953a23eee19a2c53d4876c