[automerger skipped] Import translations. DO NOT MERGE am: 508b5486f4 -s ours am: 06ad738ac3 -s ours
am: 84fdaae352 -s ours
am skip reason: subject contains skip directive

Change-Id: I48fc6a3cdfa9675b091505884c9c5dc2c2d35a2f