Automated conversion from mozilla-larch
Automated conversion from mozilla-central