Automated conversion from mozilla-birch
Automated conversion from mozilla-central