[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours am: b227fad96a -s ours
am: 32c8779c92 -s ours
am skip reason: subject contains skip directive

Change-Id: I2607c02aad32924424cf3c4a2c291a928869db42