[automerger skipped] Import translations. DO NOT MERGE am: 4ab2773a32  -s ours
am: 38698fef43  -s ours

Change-Id: Id18350d75d23a649d6a0e3fe8633c073722e7be0