[automerger skipped] Import translations. DO NOT MERGE am: 52b3a450bc  -s ours
am: fb2e738600  -s ours

Change-Id: I098f0b11ea7012cc868c265958da726957dbb169