[automerger skipped] Import translations. DO NOT MERGE am: 60be7111c8  -s ours
am: 21f6cfc3fe  -s ours

Change-Id: I42625fa4fb2fade2021639d53df49d628215121f