[automerger skipped] Import translations. DO NOT MERGE am: 73fa5066bf  -s ours
am: 34268ce2c3  -s ours

Change-Id: Id6f2c8703ff7d06e26662afd32e982d9af1b3830