[automerger skipped] Import translations. DO NOT MERGE am: 847cc98a4d -s ours am: d4b6851304 -s ours
am: ceefbcb88b -s ours
am skip reason: subject contains skip directive

Change-Id: I98a52880ac8028c4594ec0af697df08514466b81