rTEST04e88dcdddc0

Bug 1629564: New changes r?phabqareview

Differential Revision: https://phabricator-dev.allizom.org/D3002