[automerger skipped] Import translations. DO NOT MERGE am: 8222077fc4  -s ours
am: 6d6d729431  -s ours

Change-Id: I6d8f36ff7894651c5ed71716fdceacf33f7e5ef6