[automerger skipped] Import translations. DO NOT MERGE am: 76b2775eee -s ours
am: 3b4c152218 -s ours
am skip reason: subject contains skip directive

Change-Id: I2d99bb4269806a217a23c9c212888c725ba75c39