[automerger skipped] Import translations. DO NOT MERGE
am: 75f11f429a  -s ours

Change-Id: I360fca7f3e9e9b127cd370a562ec6023c0f7b658