Merged from bug 17921fbc-e7f0-4f31-8cdd-598e5ba7237b