[automerger skipped] Import translations. DO NOT MERGE am: 89f6f79cfc  -s ours
am: 486bffff03  -s ours

Change-Id: I560d6c881826d8f08d1e51636bed6cbae2026dee