Land bug 974751. r=jandem
Automatic merge