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

Change-Id: I46ac873711a81f13bcf78296ba5621aa940c83ca